made map better
Merge branch 'better_map' into omg