fixes
merge
history override bug squashed
Game state is saved now, minor improvements
merge