Fixed some stuff, and revamped save file