added and completed some todos