Lots of shit that needed to be fixed