added dennis' corrections

Change-Id: I1eaf510cd425b8bd0e2534cd1b7d442d567fe09b
Merge "added dennis' corrections"