Fixed all the things

With all the stuff