Ah I just got back to this thread and trying the new build, it looks like you've completely fixed it! Thank you very much!
