Add random distribution in area and some temp fixes