Improvements to Rich Text