cleaned up new models and added a couple user types
a little more cleanup