fixed so much stuff omg