finish watcher and fix bug in moonbaby