few bugfixes in EnergyCon