Finish 102-ion-scanner fixes #102 and fixes #101