Saving figure support and better cfg labels