-removed unecessary models
-updated current models
-fixed code that was broken