several minor enhancement