- rel 2; small fixes from git