Back to full functionality prior to changing data structure. Fixed
strings, functions, and labels in this commit.