add more options to listVolumes and do some cleanup