- rel 2; few fixes from git