Improved java doc of a couple more model classes