Improved? well, it is working...
Fixed indexing issue occurring with doing 'step' searches for the foe