Fixed gunk, saves, undo, wait and display saves