Fixed what needs to be fixed I think, now just some stats left.