Tweaks to text selection 

- There are still some important edge cases …