more work
Code-complete, but still some game-crashing bugs