Fixed another TODO, removed a few TODO in comments by simple descriptions