javadoc and fixes