Help with trigger based spells

K, well.. I just spent a way long time typing up these triggers.. and then hit the 'back' button on my mouse when I dropped it on accident.. so that all got erased.. *sigh ... that took a really long time and was annoying typing each line.. so I will just upload pictutures of the triggers (won't let me upload map) I could really use some help.. I have spent quite a bit of time on these triggers.. but can't quite get them to work.
The first trigger [Chant of Battle finish]is a group buff, it isn't supposed to be stackable, lasts 18 secons, but lets say player A's hero casts it on the group and then 15 seconds later (before it runs out) player B's hero casts it on the group then it should last another 18 seconds, ignoring the time limit from player A's casting. (The trigger part of this spell is to add 5 strength as part of the buff)
The second trigger [Chords of Dissonance]is an area of effect damage over time (aoe dot) spell, which isn't supposed to be stackable, lasts 18 seconds, and can be 'renewed' as the first one can. (cool down of the spell is longer than the duration of the effect)
The things that I need help with are:
When you cast [Chant of Battle] and then cast [Chords of Dissonance] at lets say 15 seconds into the duration, when the 18 seconds of the duration is complete, the strength of the hero does not go back to regular)

When you cast [Chords of Dissonance].. well.. it doesn't work. I can get it to work if instead of using (name of unit) I use (player number of (owner of (picked unit))) but, all creeps are owned by 2 players, so if the creeps are owned by the same player, it causes a bit of trouble with everything. So I need to know what I am doing wrong please.. any help would be much appreciated.

Try the small tips i said on msn, otherwise ill try alittle more

OMG.. thx man... I can't beleive I didn't think of adding a new unit group for each spell.. :S It's always the simple mistakes that get ya.. thanks though, that really helped a lot... I can now make the triggers more simple.. (geez.. can't even beleive I forgot about something as simple as that.. :S)

Haha nps thanks for map ;)

Som rep points..? :D