Last changes to Assignment 2

I think this is it for Assignment 2