comment 4 improvements (no spamming about on/off switches)