I feel you on map generation. It is a pain. I totally didn't even bother with it the last few years! But what you got is looking pretty convincing so far!
