Merge pull request #27 from raggy/dynamic-text-fixes

Various fixes to dynamic text rendering