cvs functions updated. One more TODO removed #89.