Improved text selection.
Solved some petty merge conflicts.