Manual start/stop commands, improve stopping logic