More code fixes
More game progress