even more shit fixed