Updated Map Generator and other fixes