some edit stuff

Change-Id: I69cb08c0f17719b0c78d18d64f111cd66569d39e