Merge "Typo fixes and non-code tweaks"