Fixed comments and generated Javadoc