Added the save part of the save/load current state feature
Loading and Saving State now work correctly
Whitespace, Comment, formatting cleanup