fixed some javadoc comments, reverted README.md