Todo comment revision

Implemented or misleading @todo entries maintenance.