Hopefully i fixed it all now