Fixed savefile bug, fixed #5