add TODO maintenance comments