fixes for new check option for whalesong