Assignment 3 update

Assignment 3 (and a little of assignment 2) updated