Major improvements to supervisor start/stop code.