Cleanup & updating some of the javadocs.