It was the Caterpillar that puffed on the hookah. Otherwise, spot on.
The Cat took over his toadstool and now specializes in smiles and dirty deeds done cheap.