removed some TODO messages that have been addressed