Version Clarification - Help?

I just saw this again after aeons, and I am very confused about some scenes that I thought were in the original version versus the TV version.

I saw, on HBO (or some earlier incarnation), the original movie with the 'unavailable' soundtrack; this is the version I just re-watched, but some scenes (one in particular) that I vividly remember are not in this original version. One example is where Mr Callahan gets fired (or at least is packing to leave), and the girls turn on Cinder and confess to save Callahan job. As I remember it, Cinder then gets in trouble, and we see her marching alone to the head camp counsellor's office, smoking a cigarette.

A few years later, the movie was shown on TV; I forget what channel, and I forget if the soundtrack was different, but I do remember the Angel-saves-Ferris canoe scene, and slight plot changes, because I was trying to explain to my best friend at the time why I was so head-over-heels for a TV movie she thought was just 'meh'.

So my question is this: is it possible there are more than two versions? One that was originally aired on HBO, one that was aired on TV, and one with a different soundtrack? I am almost certain that the Callahan leaving, Cinder with a cigarette version was the actual original I saw, because I remember laughing hysterically over thinking '...and Cowboy Cinder burns down Camp Little Wolf for revenge!' when Cinder is marching enraged to talk to the head counsellor and flings her half-smoked cigarette into the forest.

The TV version I also remember was different, because I was young enough to not know about TV censorship, and tried to explain to my friend that I guessed they had remade the whole movie (ok; I was very young and naive), because the movie I saw was so much better (imo).

I am open to any explanation that doesn't involve the Illuminati. ;) Thanks in advance.