Additional comments, slight modifications

Change-Id: I7be25d15c10d247dbbe28d7904b347f4034e0b4a