round 3 of changes to toollib-rover*