Add Javadoc

Add Javadoc to public methods.  Some cleanup.