some updates

Change-Id: Id14f74e4d5413897924346fd13ee63d8732b0080