removed some todos, eating done