DOM fixes (mostly nits) & Review comment fixes
- Other minor updates

Change-Id: Ia315ea6b9070f45777d43e9a2d488e9488358d5e