fixed a ton of shit