I think there was enough, and sometimes it would get a little campy anyway--but just enough. I like She-ra for its more serious side, but I think there was more than enough humor to counterbalance any too serious drama (ie in 'My friend, my enemy' Hordak is dying from 'doomberry pie'--funny title, and it lightens up an otherwise serious topic). She-ra herself who was pretty serious most of the time could even cut up now and then ('Now that's using your heads! Wait for it--bone brain!). And if the show had been anymore comedic, I don't think we'd remember it as fondly; it would have slipped into the category of campy girl-fluff tv.