I think I fixed all teh things