Fixes as well as Change suggestions.

Signed-off-by: Sandon Van Ness <sandon@redhat.com>