Addressed reviewer comments

Made various changes.   data-title is still supported
as an input structure until we get an agreement with Bikeshed
as to what the attribute should be.  We won't want to merge this
until that gets sorted.