Added start/stop
added toggle
Minor fussy cleanup