final touches for v1