Add d2vzw support & some cleanup