[FIX] distance caching ...
Problems remaining with text node merging
[MOD] separated structural and value updates again
[FIX] text merging
XQUTS passed, update tests passed