updates, submap code is in process of being integrated