some thermal improvements