More map gen updates

Map gen is slow now :(