Add temperature threshold for choke startup correction, plus some minor improvements