Minor tweaks, and removed old testing code in preparation to add newer stuff.