Updates, typo fixes

Change-Id: I6f536e43500dca4ebcaa91973db0d862c8740f0d