Some minor code cleaning/formatting
Fixed some except lines to try to fix a quit error/crash
Saving as the correct filename, other saving fixes