update to new version and fix some bug
update to new version and fix some bug