Thanks for the three comments so far! And yes, flint, I know what you mean, I'm correcting the score as we speak. xD
I've removed the mordents, written the notes, and I've let it all in C major. I only changed keys because the mordents wouldn't work in half-tones.

(just a matter of sound, I take special attention to scores when they're really meant to be played, which hasn't really happened yet, so...

)
I'm changing the score, but it is not totally according to your specifications yet (dots and beaming...), it's just a guideline for now.
Thanks.
