Fixes based on feed back from @aelmahmoudy

Signed-off-by: Tod Fitch <Tod@FitchDesign.com>