Merge pull request #102 from tmycann/master

Updates and fixes
phase 1 normalize XDATA meta info