some todos deleted and some more added related to rspecs