Think I fixed everything now