jdk

49b72912 - review comments and optimizations