More work on scanner, benchmark functionality