Updated some todos