Assignment 1

More minor updates