Tweaks and deck chair shuffling. Taking some steps toward code refactor / redeployability.