Fix up

I just fixed a few things, added some more. Pretty basic