Update format, captions etc
Merge branch 'cody'