More work on mapgen