Fixed what I could