Corrected 16, 18, 21, 37, 38 & 40.