Minor bugfixes and tweaking. Prep for major program rollout.