Content changes, and other fixes

Change-Id: Ic82a18aae7cfb2a89fdb06502221998b8b66802c