fix deps, comment some bugs,