Updated some stuff.

TJ borked the code (which I accepted into the main) and some commits
repeated. the game still works but… some things might be weird.