even more updates

Change-Id: I6094b5f218eb1858b8eb9d0866bbbb3176a633dd