round 4 of changes to toollib-rover*