add some todo and modified the title block for the templates