fix some return problem
submit some small problem