hyp etc all corrected