Animagi and their wands?where does it go?

Animagi and their wands?, Where does an animagus carry his/her wand?

When Pettigrew came back as a wizard in PoA, did he have a wand? No.

When McGonagall changed from a cat in PS in the classroom was her wand mentioned? No, probably on the table.

When McGonagall changed from a cat in PS in Privet Drive, there was similarly no mention of her wand.

When the Marauders changed in their school days, maybe they left their wands in their rooms?

Sirius Black had his wand in PoA, and he had been living as a dog.

Even if the wand did change with the wizard, what would it change to? I can see it now... Sirius Black the wizard with a wand turning into Snuffles with a magical tick sucking his blood with a magical core...

also,there is a film/book split here. In the books it seems that clothes get transformed with the witch/wizard thus avoiding the embarassment of animagi not wearing anything when they un-transform. The markings on the animal may even relate to what the wizard normally wears (Rita's beetle and McGonagall's cat both have markings resembling spectacles). PoA (book) also describes animagi as wizards who can transform at will into animals, there is no mention of needing a wand (when Wormtail escapes he grabs a wand to attack those around him, and only transforms after Harry's expelliarmus stops him from attacking anyone else). Eqaully if Sirius needed a wand to transform he would never have escaped from Azkaban, as I am sure they confiscate your wand when they you there. A wand is only needed to force an animagus to un-transform.
However in the film Wormtail un-transforms wearing clothes, but leaves a pile of clothes when he transforms, having just used a wand to start the transformation.

So I'm back to square one... maybe JKR just didn't think this through..or did she??..post in ur golden thots..