Fixed some minor things. Something seems to have broken save/load; need to fix.