Fix everything I broke lolol