faster, more flexible

-adds cdv reader
-clean ups