Fixed up a lot of shit