Bug fixes
removed unused code
refactor
some javadocs
more javadocs