TODO file and a small correction on the headers