speed up spot checking

Will squash the last few commits, but putting this up here for review.