fix some todo and change lib version
some fix