removed some print statements, updated TODO