Checking my CMOS XOR gate circuit diagram

[aruwin]

I understand how to draw a CMOS circuit but I am not so confident if I do it right.
I need someone to check if I draw them right.
As for the second one which is a XOR gate, I am not sure at all on how to draw it since there are both the 0 and 1 inputs in the circuit.

 

[aralbrec]

Looks good but you can't connect A and /A together. They are not the same signal. To generate the complement you will need inverters.