A bunch of fixups. The code *runs*, but there's a lot of gfx issues to fix up.