finishing touches for v1