updated TODO comments