fixing some more shit