Fixed some stuff XD