Adding in a few tweaks

Signed-off-by: Gregg Coppen <gregg@iaminawe.com>