various rejigging of files