Repaired (and broke) some stuff