added additional token types to to_string