Fixed most of the scanner issues. The refactor is successful! Although there's an interesting bug when non-numerical text is entered. I'll file it on GitHub.