Potentailly solved last issue with word matching.

I need some sort of test suite to verify this I think. It could be a
good time to learn about python test suites...