Fix consistency issues and most glaring wording issues.