Fixed bad texts
Merge