Finishing touches for first submission