Cleanups, Javadocs
Fix small things that broke while refactoring
Fix more small things that broke while refactoring