Cleanup of some more javadocs, and making sure that defaults are defined within the javadocs.