Changed how unify components keep track of the working directory.  Untested.
Minor variable name changes.