some todos added