bugfixes
vdn clean up
test
test