better figure caption and labels
refer to labels same way in captions, Nils edits