completed some todos and added new todos