Comments and Fix for previuos commit

Change-Id: I4894864863ce85549feeacd36b62f678560ca347
Signed-off-by: Andrey Shamis <lolnik@gmail.com>