Add javadoc, make a few more things private
Minor javadoc improvements