Fixed and generated javadoc