Cleaned up code, in my opinion, and functionalized a few items.  Also altered the quit routine, as it wasn't saving any changes properly