fix some bugs and upgrade a new version