WIP: some runner improvements