improved and generated javadoc