Sync rationales with template; resolve some issues