round 2 of changes to toollib-rover*