oops. finish refinements on --func and --envar