word filtering on the router
minor cleanup
merge master
tidy up and logging
fix router
Merge pull request #6 from tomcollins/better-route-inference

Better route inference