fixed a ton of shit yayy