Some minor code/comment/javadoc fixes