nvidia version abstraction, more cleanup
Add debugging features