finishing touches for first version