More work on map-surface-tmx