Fixed silly backwards logic.
Corrected collector and aux heater models.