Adds javadoc to top-level classes; fixes more names