Final touches for 3.0