fixing some stuff