Added and changed a bunch of stuff - vague
Did I fix the issues?