Short‑Term Band‑Aid Fixes

Long‑Term Fixes

Fixes Diagram