Made a range of updates to suit my setup

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