Regex Tweak

Made the regexes a little less vague, due to false positives.
Added more verbose console logging

Log what actually hit the regex, for debugging