Updates

Improvements to keep track of position when entering scan case.
Updates