I fixed a bunch of things