updates, still working on bug and adding submap code to repo