SandStorm:
i got all movies BTW. :) from ovas, i know i remember the gooat and cheese, and the date with a spirit... anyway, i don't remember if the one with the ninja girl is from ova or series...
sidzero:
The Kaede episodes were in the series. The first one, which was based on the comic, was a TV special at the end of the first season. The second one, which was an anime-exclusive story, was much later.
This site may be of some help. Though I'd be surprised if anyone here didn't know of it already.