Yep we'll try working harder on map structures. That seems to be a common concern for everyone.
Edit 2 will be in the game
about the edit 1, the game's motto is to deal with the cards you've dealt with, whether they are or not are to your liking, you have to make best use of your cards and I think that doesn't need to be changed