Finally fixed everything, I think