Fixed validation, added work-tree, and broke stash

Stash was hiding other bugs, so this looks less
functional. But EJM and I don't think that it is
a regression.