misc edits to text-internal
misc edits to text-internal
merging after pulling from master