nothing gamebreaking i fixed this time, but i did find more things i broke. some general pacing improvements as well. i hope i can finally leave this codebase alone LMAO