changed comments, TODO