Pre-Alpha 4.21

Some minor tweaks, not quite ready for a solid new version yet. I'm just
uploading this on the off chance that my computer has more problems
tonight for some reason. Having to reset the power supply was bad
enough.