more adjusts and fixes for the runner