L ininity cv minor

minor fixes and minor clean