do some changes everywhere add some more todo in the text