mac futzing
partial update of submodules and fix rot
finish update of submodules to head