Bug-fixes to text-render, improvements to files (both plugins).