More clean-up, rework more defaults

Signed-off-by: Alec Ari <neotheuser@ymail.com>