Updated map. Also header niceties.