MapTransform: Bugfixes
MapTransform: More fixes and reorg