Fixed some stuff hopefully