fixed defines, range adjustments