Some additions and tweaks

Change-Id: If5de6edbec5fb20d22d290d60bcd745a0d58c486