lots of updates

Change-Id: I8acb2b54528bab7e0dfc329af787727da421d2ee