Phase out Galahad
Minor changes to BQP2.
Playing around with constants.