various edits

Change-Id: I6070d00ee8c88dff892bfc983f5314eb92c2dacb