I think I fixed it all the bugs