Various fixes in assignment 3, added assignment 4
Merge remote-tracking branch 'origin'