Undo working a bit better.
Added back Zstats... it is handy for debugging.