More tone and content fixes. Make behaviours explicit.