final touches for first working version