Some tidying. Add missing ? on do-command?-fn. Fix order of arguments.