Fixes to major game elements