Merged changes, more wording tweaks