fixing a few bugs in runner around env setup and preparers/cleanup