Improving tokenisation

Adjusting to handle possessies and hyphens better.