fixed but with heater minor fixes