Actually fixed everything
fully fixed