Fixed sooo many things