more updates
Merge branch 'xstools'