- rel 2; tiny fixes from svn