That looks correct to me, but don't forget that making the 40 dKH reference solution requires other than 4.99 gm of sodium bicarbonate in 5 liters of water. See the posts on the second page.