Update and clean up CV a bit.