some more shit fixed