Blacklist word boundary

Incorporates all my other changes as well as the word boundary fix, which is purely lines 42 - 70 (accident sorry!).