Fixed some javadoc/comments