Bug fixes.
Thanks for the fixes! r202 broke my game, but I was confident it'd get sorted out and r203 has it working again.