assortment of minor fixes and enhancements