fixed issue where last word found was not highlighting
removed uneeded TODOs