Make some changes to hopefully accomodate animating graph changes (in the future).
Fix a problem with Regex.Escape that was breaking multi-word features.