Save Data + minor bugs