Updated to support sda and vxda, and to clean up output