added removeFromMap
places tests and fixes