changed comments

comment addition and changes relating to TODO