beauty fixes
more minor cleanup
mapData shoudl really be contactData