merged the diffs from the Testapplication atest

Testing in the real app and then commit / merge the diffs back to the
generative framework branch. Real App / Real world test show more
problems or usability pros and cons.