Improvements to comments and logs.

Change-Id: Ia6c6b112d8cb49d12fc401c35430b16351a5bb4a