parsing updates
Merge branch 'dev' of https://github.com/jmmaloney4/xpkg into dev