Junfeng: fix all bugs, test ok