add maps
map sucks
fixing merge