Major Fixup round one

Signed-off-by: daveSparhawk <daveSparhawk@users.noreply.github.com>