Lots of clean up, convert to CBVs, fix VCF bugs