More work on the scanner and it's gui