some TODO comments removed, some more TODO comments added related to rspecs