map improvements & bugfixes
merge maps
refactoring