Yes, Jehovah will correct everything that is wrong, doing so in a way that is far beyond our expectations.
نَعَمْ ،‏ سَيُعِيدُ يَهْوَه كُلَّ ٱلْأُمُورِ إِلَى نِصَابِهَا بِطَرِيقَةٍ تَفُوقُ تَوَقُّعَاتِنَا .‏