handled some todos