Added update=no default and moved some vars to defaults