Committing tweaks before I compact a couple things.