fixed some broken bits of map
fixed map and cmap. Everything hunky-dory