fix some bugs
Merge branch 'bowen' into rtong