And to answer Wendax on the chassis for #22, you may well be right but I don't want to write it in unless I know it really is correct, or I could put it in with a question mark. I'm not 100% convinced you have it, but then I don't have an alternative..
Here is the original of the picture I used for the puzzle, for interest: