Some remarks has been added to into TODO.
Some changes was applied