Pull in more changes from the Core.

Wording, code formatting.