A lot more work done,
mostly on whsi00 calculations.