Better fit on thermistor values
Resolved merging conflicts, conformized code