Fixed comments and generated javadoc