Small fixes to BVP solver. Needs a bit more work to remove redundancies