Fixing supervisor (and a bad comment)