trying to fix everything that just broke