some updates

Change-Id: Ie5f91f9e83bc11dc2e8fc4f03b6d8d4e2f541cc9