edited todo and hw2