more updates

Change-Id: I53f64772a57d5d71374016a28e8d700eacde1cd2