minor cosmetic changes
Merge branch 'offboard2' into offboard3