Tweaks to circling behavior, code cleanup.