More work on map generation/output