-Changed the way the save mechanism is called

-Fixed some bugs with entity disposing