Added/updated couple TODO sections.

Search for them in *.cpp files below IMPORTAND! section