plus some fixes to resource references and other misc revisions Change-Id: I7b498858d9d0ecfd8cf9bad48c08c93047d597b8