* TL fixes, and make hyphen non-breaking