Rework zmrestore to be more useful and practical