adding javadoc and fix displays