Fixing some stuff
Made a terrible commit message