fix various minor error