100% fixes; thx ruff