diverse minor enhancements