fix text issue
refactoring, typo
fix javadoc warnings
added unit tests
added a lot of unit tests
added more unit tests