Updated TODO, debugging messages