Fixed some terrible things