moved some javadoc to the proper place