fixed a lot of shit