Fixed the remnants of my attempt at refactoring serialized classes...
Fix a handful of Javadoc issues - need to check through the rest later to ensure that we actually have updated JDs for everything