2014.4.18 fix some bugs