Major improvements to supervisor start/stop code. Already merged in to master.