Comments fixes.
Add todo perfomase comments.