Cleaning more DECORATE
Map tweaks