minor enhancements and fixes