fix scope
add disabled state
up coverage