map improvements (?)