correct some calculations, add more display