Adjust and improve start/stop routines.