Dherman fixes

Fixing more suggestions from @dherman . I made them individual commits in case we want to discuss any of them further.