some small fixes; prepare origdiff for path changes in next cycle (22)