Minor fixes
Fixed what caused options to be ignored: disabled must be set to False, duh!