Fixed a few false positives, need to work on it more