fixed a ton of stuff