Edits and more edits

Change-Id: Iba81cf95e4a86f412d7250dfe3bc6980c3158780