task #629 -  all todo fixed