Miscellaneous text changes
Fixing merge conflicts