add button states
fix stop state
state fix
merge