Bug in string_first_token fixed.
Minor changes.