Fix a bunch of stuff found in review

2020-05-21, Gary Kramlich