Updated to my version of the map.

Merged in changes from Roland's map.