Handle broken sensor values, better comments