fixed some bugs
remove watcher