more comments

Change-Id: Ia7dbddd47b89bcbb7666cb15ec7d6cb07aef37df