Content changes and cleanup to CV, index