CSpec - some improvements.