runner & reporting adjusted to 2.1

Going back to Main? :D