Cleaned up old stuff. adapted some outputs.
changed heaton and heatoff functions