adjustements to Cairo repairs, plus Courier New hack