fixing some stuff hopefully