several generic enhancements