Fixed highlighting of tokens consisting only of hyphen and/or apostrophe
i.e. removed highlighting of those.
Fixed word ending position