Fixup survey
Factor out command and add some niceties