Updates based on client feedback

Signed-off-by: Kirk Linkletter <kirk@theantimatter.com>