version 2.1

fix some bugs