last minute changes, JavaDoc and comments