Who's the people from the books 18, 19, 20 and 21 and is 22 Toru's dad?

Volume 18 - Shishou
Volume 19 - Kakeru
Volume 20 - Machi
Volume 21 - Ren
Volume 22 - Tohru's Dad Katsuya

I believe it is this:
Shishou-18
Kakeru(I think this was his name)-19
Machi-20
Ren-21
and I think that is Tohru's dad on 22