Electricity Demand 2 and bug fixes