Add fan and heater status and some corrections