more updates

Change-Id: Ice7cad04a5da6ff56634fced6791a6a0f161d0b7