Tweaks and updates to parsing files
Merge branch 'staging'