some updates

Change-Id: I6053e3ec369a604a2bb762e297096545d0b04761