Updated main
CVS writer fixes
Merge sort versions with relative tests