Improved save functionality and did some testing,