Assignment 4

Assignment 4 and other updates