Fixes hikaru#recover?
refactors some of the ante code.