final_spec progress - fix TODOS!