enable start/stop button properly
Merge branch 'experiment'