Formatting, clarifications
Added more abilities for tenant