Repaired some stuff...