-more JavaDoc
-some implementations
-fixed some Sonar issues