tweaks and cleanups after a verbal runthru