cleaned-up some javadocs