fixes and more javadocs