Please check my sentences with relative clauses (2)

Thank you all for your ongoing help.

Would you check my sentences again?
1 The woman (who/whom/that) I wanted to see was out.
2 The people (who/whom/that) I met at the party were very friendly.
3 These are the books (which/that) I told you about the other day.
4 This is the boy (who/whom/that) you saw in the restaurant.
5 This is the desk (that/which) I used when I was young.
6 What is the name of the American boy (who/whom/that) you met yesterday?
7 The book (that/which) I read last week was very interesting.
8 A man (who/whom/that) you know well is coming soon.
9 Wow! This is the tallest building that I have ever seen.
10 I will give you all the comic books that I have.
11 This is the same pen that I lost yesterday.
12 The American woman (who/whom/that) I met yesterday spoke Japanese
13 This is a/the picture (that/which) my grandfather painted last year.
14 The dress (that/which) you are wearing is very beautiful.
15 The food (that /which) we ate/had at the hotel was very/really good.
16 The man (who/that) gave me this book is from India.

Hirashin

All are fine.

All the sentences work fine without the words in brackets except for 16 which needs either 'who' or 'that'.

Thanks for the help, joadpres and Mike_H.