sort watchers and some speed enchancements