merging
Merging UAI formatting updates (citations, subtitles, etc.) Few small other updates