cleanup
added another check to remove false positives
more testing