Small fixes to code and javadoc
very final commit of project