Comments and docs

Change-Id: I2414b424ba1e1b906a64b427e148da3112875347