Few minor changes and updated cv