* WIP attempt at fixing recovery-straight-path issues

* linting!

* handle not current due to old measurement readings separately from resets