[misc] fix listing of VHD drives when they have been partitioned

* Also harmonize some of our text output