Save via UUIDs in the zap command, fixes #810

Part of the saves name -> UUID update
Also move some debug around