much better pounce tracking (more efficient too); some cleanup