Added TODOs for later to pylint.
Fixed TODOs.