fix deps, add events