improved map, still some work to do