Detect and differ separators

and extend the vocabulary