Fixing README and comments

Change-Id: Ib0e33a50b9acc0f3cf0bd971200ed8ae903a9339