many improvements, fix bug with volume names that contain numbers