Fix and improve cvstar.