Various edits only

Change-Id: I209f96a909304cef1ab31272296554ac3b48bf5b