A key repaired, few fixes