added Assertions to Model. Fixed some other bulshit