more additions and modifications

Change-Id: I2b12d704997c1c15923dc191510a10801029b148