Final touches for 1.0