Changes to assignment1

Some small fixes