- rel 2; bunch of fixes/updates from fc