improve scan timings, etc