Changes to get WAXS filepath correct
Small changes