round 1 of changes to toollib-rover*