Further expanded the Scanner. Need to handle some small edge cases.