fixed stuff. checkpoint while I work out hydra-derivatives stuff.