fixing some