Updated figure todos