Completed some todos