refactorings, javadoc additions and minor fixes

refactorings, javadoc additions and minor fixes #111