Fix typesetting and wording