jdk

89fce6a6 - more code grooming and comments