fixed a ton of things I think?