Another batch of changes and clarifications