Bug fixes and tweaks to text resolution.