Feature/fix for supervisor

WIP. I'm still doing final testing, there might be more problems.
Intended to delete instead of just comment out? In other parts of the patch you've either deleted the log line or wrapped it in a conditional.