Fixed some things

Getting really fucking frustrated at this point.