Further work on adaptive leapfrog (still WIP)