runner.py improvements

Blocks 2.6