patch in Ben H's review commits

Signed-off-by: Matthew Story <matt.story@axialmarket.com>