Fix typo in new class files and some javadoc