various updates

Change-Id: Iacef04586a2e4cc5bad38735358ddf9fcc7ea15e