2.2

some small enhancements and housekeeping