Refactoring: separate standard CV from agghoo + some bug fixes