ENH: improvement to auto-generated captions & figures