Been fixin to fix my fixes, so here I done fixed em.