tidy up ScanActivity and add some todos