Added some filtering to kill false negatives
Also tweeked some things for future scripts