fixed lots of shit