some changes are made
modified some ToDos