Fix STEP_FACTOR

Also reduce buffer size