Tweaked some things and Made Repair work