Scan better

Clean up the scanning. Scan and then stop after N seconds. Add Swipe
control. Move to direct pre-L scan routine.