renames, some javadoc, reverts