tweak how disabled is handled, add default