Javadoc

Cleaning up some javadocs and TODO items