improved map and movement