Fixes, beautifications, tweaks & README update

Change-Id: Iba7b10be3d1031bb81464072fada962f39011e62