Properly credit people.

Because I can/should.
...and fix line issues.
text box works now
Merge remote-tracking branch 'upstream/decorative' into decorative