Updates per @julienw review (plus others), 2

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>