fixing some more things