Bug fixes, add thermometers