Minor changes

Cleaned up some code and started on the new saving system.