Fixing issue #926 -- stringy fixes. Mostly branding issues.