last few fixes before release