fixed so many things