Updated comment documentation and added TODOs.