Fixed meshing issue, started to add CV fixed

CV fixed for proper energy conservation.