Yeah, I have my dog with me, should I leave him behind?
And yeah, I used all five of them that the witch gave me. She won't give me any more for free if I abort the quest and start it over again, of course.
I have all the add-ons for the house made, including the places for animals and the prisons.