Moved Vidi viz to use CC
Fixed small usage issues
Cleaned up a lot of mess