#KJ-37 Review todo-s. Solved some todo-s, improved some documentation.