Release candidate 2

Many fixes