Impulse resolver improvements (still WIP)