fix things taht are broken, probably break things that arent