fixing fuckups