fix some bugs
Merge branch 'master' of github.com:elan2wang/UAA
fix some bugs