small enhancements