added figure and caption numbering