javadoc and removed warnings