2.2

several minor enhancements