As I mentioned in my earlier post, yes, the boxes are all correct. The only incorrect spot was the wrong type of partner being checked.
