tidying, neatening, linting, dropped to BDM1-P0 for speed, changed forcing