Text Changes - Tooltip
Text Changes - Round Three
Merge fixes and more validation