Final touches for v1