Questions 17 & 31 completed

Thanks :)