Tweaks and updates to parsing files