Fix watcher
Various article bug fixes
More fixes