调了些bug
merge with xianfeng