fixed some bugs
Signed-off-by: manageryzy <manageryzy@live.cn>