Added path reconstruction. Various other changes.