several minor fixed