Added TODOs ans FIXMEs while reading the code.