some javadocs and method renaming