fixing some more