Modify how errors are handled, clean volumes a little