Better captions for figures
Merge conflicts in better captions