fixed a ton of things