Fix countless typos and sync changes across policy