Some more format and wording changes