I think I fixed some stuff