okay this isn't going to work lol
code cleanup + fixed some stupids