marked some todos as done