Pathfix branch

see my recent email for an overview of the pathfix branch.