removed some TODO items, added a few back