update to new version and fix some bug