big commit - map changes, bug fixes, etc