some todo comments deleted as they have completed, some more todos added related to rspecs