fixing some more stuff