update bundle, restructure identity, fix some new bugs