Finishing touches for Lab2