Save game functionality + bug fix