move to nightly 2.0.7 + various fixes