ex3 done, ex1/2 tidied up