Fixed Bugs and Saving