fix up more shit