more javadoc + minor formatting fixes