added map (flat) to overview, addressed some behaviour due to class changes.