Added support for strings in scanner, still not perfect