Fixed map.
More tweaks with Jeff.