fixed javadocs
cleanup and more tests