BugFixes
Added save and load and tested