map
Wall rework & slight cleanup
Resolving conflicts