#154 Various fixes for the map. It will compile now, but it's not yet ready for production.