Commit 367684b0c282eaa59f831fece112b2bb82a2a7ad

Fredrick Brennan 2021-11-28T22:56:24

Add patches suggested by @slouken in round 1 review