Enhancements and clarifications

Updates, changes, clarifications