Made supervisor creation/deletion better.