added some javadoc
Small fixes
Stuff not included in the last commit