Fixes

Fixes to map-e and map-t draft