lots of updates ...

Change-Id: I3feaaf7820a3c7f1abf349cfd3a5a3eae4235621