bug fixes (tokenize bad strings)