a few more enhancements