finished up watch optimization
final watcher fixes