add Env to RunAction, + cleanups