Fixed the more issues. May have created more, but whatever, it works now