Good fix. But the biggest one needed -- and changing the Constitution is a tricky business with high risk -- is TERM LIMITS. The Framers never dreamed that people would stay in Congress and work to enrich themselves by taking bribes from foreign Governments (e.g., China, now waging 5 G warfare), Global Oligarchs (e.g. Soros), and huge corporate interests.
TERM LIMITS IS KEY. SO IS GETTING BACK TO EQUAL JUSTICE AND LAW AND ORDER.