Makefile tweek
Update TODO
Update canossa
Minor fix