fix some errors
completed model classes