fix minor bug, minor cleaning, cv_assert with messages