Last set of edits from KS, KLM, OIW, RS