maps
fixed maps issue
fixed conflicts
fixed more changes