fixed some more shit