Fixed some TODOs in  and updated the main index template.