fixed a lot of small pieces of shit