Many updates

Change-Id: I4f2a930a639635aad3f9a91a2579de04899662c7