Fix switches and monitoring of consumption

[Raphitpt]

Hello, I really appreciate your work. I improved 2-3 things to make the rendering code clearer.

In addition I corrected the switches and it works perfectly for me.

However, I would like help because I can't find it, because I have a connected socket with consumption monitoring and I would like to recover this consumption. Do you have an idea ? Sincerely