Fixing bugs, removed unused watch event