Adding some review changes. Build successful, untested.