Finally fixed it. Mostly