added new map, not finished yet
fixed new map
merge; fixed new map