Update some TODO comments