Edits mostly

Change-Id: Ib2191a144c153bff4afc665bb2f4953633b8d66d