Updated javadocs along with some cleanup.