Map improvements day 1