fat arrows + scope fixes