v3.0: volumes.files becomes a dict, bug fixes

Ah, you mean that, ok