completed exercise 1

completed question 3
fixed some things on question 2