fix WuMou
several minor adjustment by lrl026