improved map generation quite a bit