various minor fixes/enhancements