Cleaned stuff up, got a little wonky, hope it works

- Tried to make sure everything was up to date and on the same page, if
it’s not then it’s ok cus we have it locally on our machines