Stacey's requested updates.

Signed-off-by: J Cornelius <github@jcornelius.com>