Enhancements

Clarification and enhancements