More Text improvements
Improved Notification