Updated TOTO and removed obsolete watchers dir.
Clean up and comment a bit for wider consumption.