version 2.2

fix some bugs