text fixes
merging text fixes