Adjust regex handling

Make the regex a bit more strict in handling how words are parsed. This includes things
like handling spacing before and after, as well as dealing with punctuation. Now it won't
bring so many false positives...