- improved map generator logic