-Fixed some stuff