some more feedback

Change-Id: Ia265328cf37eaf3d5069331c9d1df664e3c0306e