Added TODOs for mostly Javadocs, cleaned up lots of code, added consistency