tests etc
added some javadoc
mergefix