Improve scrubber and seek position calculation