some edits

Change-Id: I1e0c70f1455886042e2ab25336130681e1968874