add TODO, minor correction