Lots of changes to make game playable