Fixing the many things I broke