Updated defaults
Minor mods