Improved scanner, began implementation of str/intlit regexes