major update

Decided against a third watcher for practical reasons. Which means the
next few days or so will be bugfixing and optimization and then I'll
move on to Otherwise.