I fixed a bunch of shit