cleaning up imports
afterpulses still a problem

tweaking AP, hit grouping algorithms a bit.  Doesn't seem to help much.