general enhancements