add TODO comments and cross-reference to bug