Fixed up ALOT of stuuuuuuuff