remove some comments and add TODO's