Gitar

Review code changes, diagnose CI failures, and verify fixes