fixed other model classes that weren't in last commit