minor fixes and enhancements