- rel 4; more fixes