Small changes
- javadoc
- refactoring
- some more JUnit testing