several minor enhancements