added figure chunks, updated todo